Merge changes I4077bd6a,I92c4090e,Iff579600 am: e9539eb02f
am: 122310429f

Change-Id: I86b4bca4a314f8f3d093ca000e3253a453522122