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

Change-Id: Ic3f675c86b0b5185ea222ebfe99bb463a83adc1e