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

Change-Id: I99cbca983a5c14d612c5942c9224295d1e25c83d