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

Change-Id: I6494022dee5f08156222d582d9aa6f761cbd363a