c4753a7ff2
* commit '2ecb884f7586218a1608cd5b0d82a45de6f9a069': cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d