Merge d35a08e68c5355284658e17db9d148d1ccc1b706 on remote branch

Change-Id: Ied01d9df894481b3002337a791aca990e812a2b6