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

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

Change-Id: I9ef16ae1f9c1e35d995fe2facc8c8e21b143f0aa