Merge 2a47ed6713214628d7de468d3b47577adadd2418 on remote branch

Change-Id: I58e285a9ab1c0e6e06d8c9af2b84ad8e3781a277