[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: b5fcf3d808 -s ours
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127 is in history
Change-Id: I695f72ebbfe0b2eea6a725cefab2a39ff7abcd64
This commit is contained in: