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