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

Change-Id: I07aeb6ed59e9a017ea0fd7bf80a3fbc6c5767bf3