[automerger skipped] convert hidden configs to public am: cc2f579438 am: 11cf1e29f5 am: f34d0956af -s ours
am skip reason: Change-Id I722e0bfe587bc21e18a6cfea2de3df0efc1018c9 with SHA-1 c10e3d844e is in history

Change-Id: I27acc2ebff0a3cd6de783cc5d22332c7e7b2accd