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

Change-Id: I962ddd96c43ed75a86f2f51a38e1f447370d3e1e