* commit '4e4001589911b971d56c72acee140526d4575dac': cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '4e4001589911b971d56c72acee140526d4575dac': cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a