Merge f1c7381ff18f0ea01157cede1eb244a468607f45 on remote branch

Change-Id: I563003b6f1673040e3bffc06d556aa5085151320