Merge changes I1360b7ee,I587f5f4d,I8cb26827,Ib8766a89,I952f4935
am: c979f25706

Change-Id: I6cbcac2cfc32b7a8b462f1105662fb0f6b26ca46