Merge "Guard against incorrect context use." into oc-dev
am: 2cddbcaa0f

Change-Id: Ia2905116802bf9d1ed88abb75aefded34d130853