am 85abaf66: Merge "Failure to find an oem partition should not be a remount failure."

* commit '85abaf66c499a44326d83d488f4b4f5add235f4a':
  Failure to find an oem partition should not be a remount failure.