Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327
am: 1a34a41268

Change-Id: Ic3673491705af125a88f66460996911244184fc8