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

Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add