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

Change-Id: Id087cd10b61724850a0f882a6d18b22f65e5b37e