Merge changes from topic "adb_root_in_user"
am: da1251d6a5

Change-Id: Ia9959008ac5cc571efe46bd0b80cbae53356d5ed