* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66': cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66': cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7