Merge "Remove root permission requirement" am: a553f9832c
am: 0f61e8240c

Change-Id: Id5c25ff38f5746b2f512625f3eaf0e03ee82afe2