am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

* commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f':
  Fix transform issue in CaptureIntent.