Merge "Trivial correction of Camera2 API description" am: a909dad0c3
am: 7e308606f6

* commit '7e308606f605dd1bd047e20e17ee53122a64b8ba':
  Trivial correction of Camera2 API description