Merge c58907eeea2e015791f861cec1cdae291228997a on remote branch

Change-Id: I699661a9e514a9df58992b776d2dfeffa89fc25d