Import Jack and Jill Carnac 1.2-rc4
am: d602dee883

* commit 'd602dee8834bdbd08d9780f62708d92a579e9cde':
  Import Jack and Jill Carnac 1.2-rc4

Change-Id: I7f99df4f0719569a95d6e9689f5d20000156ebb3