am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev

* commit '336efd3166534cb44ad2be876ba7f8ea30db65c7':
  Fix various Wear media CTS failures.