Merge ea003dbefa76feb11888b854ba731224370979b3 on remote branch

Change-Id: Ia13dbcfb51724bc8a50e21cd0c889c7af661c6c5