Merge 289142060c49370858feeb2fb0343611e52cb10a on remote branch

Change-Id: I27cc3b5db068ea98eaa9dbeab8d9fd911d2d8a64