Merge "Do not send HdrMetadata on older interface" into pi-dev am: 14b791afb6
am: 43f64f49bb

Change-Id: I45747763b99fb81e49612f1a50ef24e0b78d92ba