[automerger skipped] Merge "Secret code fix - uses public symbol for secret"...
[automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f7 am: 66d4405d -s ours
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c63581 is in history
Change-Id: I36220a7c22556640143212703a277955452a0ceb