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

Change-Id: I0d296a9e39bb64a1caf2960456d6fcac908e9195