Merge d80f5d9d859636ad40191014de7735b449fe4240 on remote branch

Change-Id: I54e13bf1b7ee159f63aec7321402dee377d56d21