Merge "Handle auto-unlocked managed profiles." into nyc-mr1-dev