Merge "Ensure invoking obsolete methods throws errors." into oc-dev
am: a5567dc7de

Change-Id: Ib84c6ad769d2263e98ed2576318ca0b332224da0