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

Change-Id: I806e4ce4f01e28c3b7e413b6447154a3cf77aca5