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

Change-Id: I00d0a5267913c284eddd97bfe7eefb15b9ee403e