50e894c800
* commit '6c9d636f40477ef3ac44a6e30ac645d708d89002': cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8