Merge e1434b254bb22f681fe348abb44fa02722870ce5 on remote branch

Change-Id: I111fcfb4bede254169310aa3facf9a5573ec361e