Merge fed157d76c473fa6caec216557d31ff9d34b7450 on remote branch

Change-Id: I7d9a168bb1d44d616f49d588078ceec9d53d66e5