[automerger skipped] Merge "Notice file embededd in APEX is deterministic"...
[automerger skipped] Merge "Notice file embededd in APEX is deterministic" into rvc-dev am: 327b057e am: 8e4868b0 am: b2b9d7a4 -s ours
am skip reason: Change-Id I25f6cd9dd0679af6acfc2594314d11fa53ae2151 with SHA-1 402ace6c is in history
Change-Id: Ic23b20f68da4400d8247af1d7fcf8bc9a48277bd