Merge "Assert the non-presence of stamp" into rvc-dev am: 845bf780 am: 988911bb am: c799e176 am: cac584f0 am: 2a927488 Change-Id: Ieeac90bb079c72b42bd22782a386664f23410396