Merge 32508a33e2f65ca8a0606eeb79ff3492bad126c1 on remote branch

Change-Id: Ie444e1baea255cb633b9b2c75c417c80993516a8