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

Change-Id: I3c0977b0919638b11052d00cc14d320b43765ed0