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

Change-Id: I119bd3f156a00ce36ef82a98f45da361626beaae