Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"

This reverts commit f25be17f6413417aa6a1e3a5a791302099d15008
1 file changed