Merge "Import Jack and Jill Carnac 1.3-b5 for Dogfood"
am: 2c4be2a40d

Change-Id: I7b5984f83856b5c8a18164a0ddb31a5cdf2937d8