Merge 804b89d86a6c48ffc55eb85a6365ca1371f4c700 on remote branch

Change-Id: I0ae75f4b39f58ba376d4697db8e95d56c7c6873f