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

Change-Id: I817082994371e47339adf58906331ddd356429f1