Merge f494b4fccf59927339c4ffd668840ea8dc6d174a on remote branch

Change-Id: I905a4292fb88d7258da840b4e93390772fcbc6e0