Merge "Camera: fix camera_metadata address expectation" into oc-dev am: e812feb56f
am: 1ea71cc4f2

Change-Id: I03ddf0ff1dd0e0a8342cb8fc097bdf27ee15b044