Merge \\"HWC2: Add properties to revert latching changes\\" into nyc-mr1-dev am: d16f6ae2bd
am: 3569f1fe4e

Change-Id: I430c5609590d2c5f04bf6a07ff509430a2bcdf9f