[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 -s ours
am skip reason: Change-Id I25f6cd9dd0679af6acfc2594314d11fa53ae2151 with SHA-1 33c77369 is in history
Change-Id: I9134750c1f13bb749d260af58eaad03a4a3c65b2