Merge b1bad735d8188ecbd46531d22410a83078152f7f on remote branch

Change-Id: Ia97cc96a226d3cf149e6b80ecc78b79049d947c4