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

* commit '95dfc43f698b8fbb66d70974fd583c7dfc6ec91f':

Change-Id: I1902ad9100cd65302b97e910e582777341ea232d