Merge ec2cd1feffe7a63e11258f673d330769542bd5b2 on remote branch

Change-Id: I0237900750d3f441871051d5cdcc3e498a309a71