Merge "adb remount documentation error" am: 365b43b933 am: 85eceb2ced
am: d417e5a5fb

Change-Id: I507d3af1e1f9cfffffc4cc1192b1ff618af58fad