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

Change-Id: I0c75bae90081c63266a20583b5d8d857e4d71ca5