Merge changes I30d6b530,Ie2e5872a,I313cfef2,I87dfb6a0,I70709ba5 am: 5b2d0987bf
am: 3adf871e00

Change-Id: I456e798b80142d44e259b251ede8121eff99a897