Merge ab8add4cf9f5b4b08f9a516888049b2ec9de0dae on remote branch

Change-Id: Ifde8844104c2aff667eaf472bc098d18e47924c3