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

Change-Id: I7c1ff3a0ffab02b5f779c4ad988cffa23dc70700