Merge 8280055c033ff6f87629f334532da1b04079d702 on remote branch

Change-Id: If7896031a5644ca8656d1d5e2b46034cdb743055