reconcile camerametadata

Change-Id: If8cee1f9f8d62d0bfa282c9dc4ffa79b0151f85c