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