Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev