* commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f': Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
* commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f': Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"