am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5': cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
This commit is contained in:
commit
3e02d13040