Merge 1dc2480f33fd3604671f828ba81858bf6948c395 on remote branch

Change-Id: I33e5d4c46e94fc7d760f49697d35efec55d2ab7a