* commit 'f3c9a2517ad9db2af4e11435068c24410eaf9c57': Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
* commit 'f3c9a2517ad9db2af4e11435068c24410eaf9c57': Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"