am d5aa67cc: Merge "Wait for completion of device mapping in mountObb"

* commit 'd5aa67cc53bd10ba851179d634a7ed649958e5ee':
  Wait for completion of device mapping in mountObb