Merge 1c9f78975d6719847adea718cc89085ac0395a50 on remote branch

Change-Id: I18f414fdc60fe17b088981509faccd550e79d8b9