Merge 45f180de4ee0030f629c0eb784c897f197ed5338 on remote branch

Change-Id: Ia1f0eae318c06cfea9e3d95341992ecb5534598f