Merge 5e2e634e89568e5c3adcba671551d3e8787a5069 on remote branch

Change-Id: I93567f645c07f48a1d087669f4c8c91c1bd4d0ce