DO NOT MERGE ANYWHERE Revert "Revert "Ensure that ..."" am: b10a890a92  -s ours am: 3926317ec5  -s ours am: 1fd5ba4e6e  -s ours
am: c7b9b392a3  -s ours

* commit 'c7b9b392a32e0c25370a1c48455ccc7ac12cdd39':
  DO NOT MERGE ANYWHERE Revert "Revert "Ensure that ...""

Change-Id: I08200a843d2867a845e6a564fc87cd9149eb468a