Merge "Remove root permission requirement"
am: a553f9832c

Change-Id: I4f3d814ecf376cba154a71bf92245bab69c76d70