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

This reverts commit 1431fd98b1a9b69a8b9a03d07bc408aefe30c28e
1 file changed