Merge changes I6d125624,I549a9211 into klp-dev

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