Merge "adb remount documentation error"
am: 365b43b933

Change-Id: Ic72a571a47d964df3a181e9890a57fc10c6a0157