Merge "Use current user for lockdown setting" into pi-dev am: 2b9d205fbb
am: 23d242fb8a

Change-Id: I90030c8f0ce9c6e27bd0c857602df50eb478c7aa