am f55916bd: Merge changes I6d125624,I549a9211 into klp-dev

* commit 'f55916bd31bb79dd47739115b26c0886f9523756':
  Camera2: Fixed issue with HashSet not being initialized
  Camera2: Documentation fixes, mostly capitalization mistakes