Merge "Fix concurrent writes to the hardware composer" into oc-dr1-dev am: 87cd11513f
am: ad59d3ad0b

Change-Id: Ib0e1c3a2804d2b77c7f41adcca65b4de926ae24b