Merge "Increase adb-remount timeout" am: 66b0c31f60
am: 5ffb8beaad

Change-Id: I31d8b2787222406d55fec05270481b27eaacf12e