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