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

Change-Id: Idc9ecd57f65a9ad273407ca0ebc30ad7fd15dcc7