Merge changes I794a24d0,Iab32b2db am: 6dc382dfd5

Change-Id: I03f6b9e521793b92f83a21583a2e53fb1d31fba1