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

Change-Id: I2c19629027e9127e2e9bfdfe6c3db056ee9a26dd