Merge 673b5199984a868e0494e5877e15a8b74123e218 on remote branch

Change-Id: I4c2e70ab50565e874a76d642ec847b530d0a4c56