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

Change-Id: I79ebacaf70b840f1408618f3517a6c61ab2e8725