Merge 6085a65bedaf7774740c66712be9baadc0d29412 on remote branch

Change-Id: I5bd88da0d6f040c6763a8b1992df4e073ee77b52