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

Change-Id: I97765530c955a8a350195177e508dc245f156b31