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

Change-Id: I30d9651db62133baab698faa63639b2011288ada