Merge d1446f0efdd661e24e4b5803a4cfe2d6e1498fbc on remote branch

Change-Id: If2b78a3031bcb55e135eaf3f2f1dc96cfd2139d3