am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a

* commit '10a36020e3d37ef088f5f7ed6d64ba35847fc069':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a