Merge "Import Jack and Jill Carnac 1.2-rc4"
am: 7d12afa6f6

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

Change-Id: Iadbe8c85c12701cddccfc3f2e8964793f48d1c70