Merge "Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras." into nyc-dev