Merge e12eaa37ed88815957a5e4a4537fb0dbcaa7f365 on remote branch

Change-Id: Ibc4c0379001bff0323d2f130a158f8ed4212f80d