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

Change-Id: I50dbe8ee99de87524afd273ba281b008528f8e9f