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

Change-Id: I27f8bd2c5e3756ffa809dfeed4887ea849e4eb3c