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

Change-Id: I822675b3e668295aa4933be8f74223a3167e75b0