cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052

Change-Id: I57ea8e2ace24a777603513340302265138711590
2 files changed