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

Change-Id: I83fd8c83f8319b8d66119769f9fcad9d107a5d2a