Merge 4269cc2e23fee98c79b15de88b238159a2cb2ca9 on remote branch

Change-Id: I239817566851a5534461145ab840513d82182082