Merge "Import Jack and Jill Carnac 1.3-b4 for Dogfood"
am: 26064656e3

Change-Id: I9eb116a44526a34b7b3f94cc9af23ca1ebe92565