Merge changes I3872dc51,I3b185f68,I37a25ca7 am: 956c204f1e
am: 6a6f2e9d65

Change-Id: I7005fce79b0ba0cb3fa74ef2d1052e9165fb633d