Merge 6f5ac7276be00d13cff1fdc09487f2bcff993d8c on remote branch

Change-Id: I3b85d5dc8678f6a4e24ba54a817e4dff0b402553