* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a': cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a': cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5