Merge \\"Handle auto-unlocked managed profiles.\\" into nyc-mr1-dev am: 2b58e464bb
am: 502087e464

Change-Id: I16b8beb110c534124475e7e0111a912ffa3e5799