Merge "Otapreopt: Remove b_mount_path" into nyc-dev
am: ae3cd06

* commit 'ae3cd0687610ec585119b54ac18141f6aea4e593':
  Otapreopt: Remove b_mount_path