am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev

* commit '914970b4735993df3246b02fd9a18b55f15ea8d4':
  DO NOT MERGE: Hide new camera API.