Merge "SF: Unittest Coverage for HDR/per-frame-metadata" into pi-dev am: 892e17d7e5
am: 0f47305d91

Change-Id: Ib53d6adc86ada4cab2b62333da9dc7d27f092602