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

Change-Id: Id3e433048cf25e8c50aa20e97dca6e3112f0fb57