Merge 43aca8e084ac331097786668668a25cad40b90f2 on remote branch

Change-Id: I660970753f466417886a20b89f9c0f03d6793902