Merge changes from topic "adb_root_in_user" am: da1251d6a5
am: ac5d9460f2

Change-Id: I5a71508fe02bfb4fc182b2e2501a9d6bf39eba97