Merge "Fix HdrCapabilities flattening" into oc-mr1-dev am: 1d4bdc1b4c
am: 018ca99ae2

Change-Id: I3fee71abb8332e4888a7b094870dba16c52ded45