Merge afdab874f188da0476c416e85f93ab82fec60cd9 on remote branch

Change-Id: I3fefdd2e6b6fb01ef5415122fbe3eb2b1453906f