Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f
am: 796c9446f7

Change-Id: Ib54334f0147616e604d8852b368aaefb44df88ca