Merge d6b1b0d806d52a87018dec4474adf324e43c7665 on remote branch

Change-Id: If3fbd183a1440e9cb1e44b85b910c70f7cc63ab1