* commit 'd9f91425fc740bc85a8629a27b68b48acaf85962': cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
* commit 'd9f91425fc740bc85a8629a27b68b48acaf85962': cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052