Merge 8354b739333f4ad76d1b98287ceb694b22ff6763 on remote branch

Change-Id: Ib63a5a80663f42277edbd539aa3162bdca45740d