Merge 1318cfa73b7be172345dbe818f3e158d456f234e on remote branch

Change-Id: Ia9b5a28cc40211c315ae23885f443f979bacb87e