Merge "Clarify lockNow usage from a managed profile"