Merge 45c10e42176c13d109f44478eafdd4f6ab39d271 on remote branch

Change-Id: If292837ab3d3eddb8e6446ab753c5daebe2e3704