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

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