Merge "DO NOT MERGE Add check for isRestrictedProfileUser" into pi-dev
am: 229543beb4

Change-Id: I8b072ba82a89881c0f507b87d36b43f0ee4492b4