Merge "Import Jack and Jill Carnac 1.3-b3 for SDK and Dogfood" am: 318081d958 am: a50edddb53 am: 56fc307d4c
am: 7ab0057755

Change-Id: I86b4a946e9b262c5f2d553c862e2517f4a2d26c5