Merge "Ensure invoking obsolete methods throws errors." am: c48266eb44 am: ec2e5d82a9 am: ea817e5ca0
am: 35d8a588e1

Change-Id: I4cc91dfc1e91534afda5c1d0c1370790c74c34e6