[automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
am: 66d4405d1d
-s ours am: ae0bd4256f
-s ours
am:f54d333c24
-s ours am skip reason: change_id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA127c6358127
is in history Change-Id: I22b3f51df7db0b7a2ad6c914d9d810bddbe6c47a
This commit is contained in: