(Imported from upstream's 9dd6240201) Change-Id: Ie0f6f876e06ac28c717ec949565f6b0126166b30
9dd6240201