Merge "Merge "Assert the non-presence of stamp" into rvc-dev am: 845bf780...
Merge "Merge "Assert the non-presence of stamp" into rvc-dev am: 845bf780 am: 988911bb" into rvc-d1-dev-plus-aosp am: de560737
Change-Id: Ib8f364352fe2d6183d3f2c38dacbec68ff5b5326