Merge "Camera: Fix possible invalid metadata access" into rvc-dev am: 967bfe95b6 am: 99c2c39171 am: 2b869d3bfc am: bfd9d38ff7

Change-Id: Ie2c49558b59c6aaa1f489e31fe4173649c8ae45e