Merge d6a1f7efc8cbf4553725c5edc2d3a9f6c11ac2a8 on remote branch

Change-Id: Iea13b6595231292968a2e54706943aac19b5501d