DO NOT MERGE ANYWHERE Revert "Revert "Ensure that ...""
am: b10a890a92  -s ours

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

Change-Id: I895aec308a8870b9cec53879078e0c8bd5fb3110