Merge 607099194a327711f68a90da72f91fe1391b1b66 on remote branch

Change-Id: If98a07861998ac17f307b9d786ad6ee606367e75