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

Change-Id: I5040c808599fc41725f0d00a8f7847e064ccfef1