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

Change-Id: Ie07aaee1ada5e7143dab8fbe3fb617372593625b