am 90f4857c: Merge "Remove samsung/manta no-op."

* commit '90f4857ca8b2812543b6a1da1de23371dfb748b0':
  Remove samsung/manta no-op.