Merge ccf95c3feeba5a6211d043fb1f0f8784b3bed9c9 on remote branch

Change-Id: Ied604aedc0b6aad864074cb475cedfa0c00a3611