Merge changes from topic "o-mr1-hal-freeze" into oc-mr1-dev am: ce8f5cec2d
am: 1c0e5e6b4c

Change-Id: Ia85f7b5d5ce9ebdd911e4f5515d4e515c62ef495