Merge b249409124fbba9384bc461c55a62169a41ee9c9 on remote branch

Change-Id: I66c2acebd6f4615ea8b8c7244fed1b11b5703ed8