Merge 6578e382b4739b4bacfad3436b32907fa57e0d02 on remote branch

Change-Id: I700cd54da930e089597129a523638438edf29d2f