Merge e1a4d59ebc986018ed5e0f36b95a9ade8dd4e64a on remote branch

Change-Id: I6569740a6e8723791b0e0af1f38dddabe0b5c8b7