Merge 1a4dc02eb74466d3ded2e1bd073296330e8d8a28 on remote branch

Change-Id: I71e95a3bed9f1afe1aaa0773c0e19a52b1ac34d6