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

* commit '09f48ef2c258cb0ee34d0783a31d74dc0a31dfb6':

Change-Id: I45fafc619b080ee57ac6207dfb2b17654f28aade