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

Change-Id: I63d619b0ffe942182a53c5cd0ea01b89a7846947