Merge changes I8d0c60e5,Ib8ad0ad6 am: a6bb369cb0 am: c7d9eb8636
am: a1c2561863

Change-Id: I1524ea69322f1bb8f2a5bb618f066461543f8143