Merge d2b8d3d96149aef14f8ad1788183fa6aabbd0066 on remote branch

Change-Id: I6bcdfb0c29fad29df5971b7c07e68d53783af04e