Merge a21d2eca3fbfd9d464ef3b87a3f8a76fee337222 on remote branch

Change-Id: I799c9527484f2996ebce871317faca5e2d01737a