Merge c5d8c32b29dbe2e42b7740883f7618bcac012698 on remote branch

Change-Id: I9214a3ecd6855efb0ca4222736609df1ffa5a5f1