Import Jack and Jill Carnac 1.2-rc4

Jack version: 298900 f95d7bdecfceb327f9d201a1348397ed8a843843
Jill version: 298900 f95d7bdecfceb327f9d201a1348397ed8a843843

Bugs fixed since 1.2-rc3
Bug: 28875299


Change-Id: I873e17527be96a8423a2991b5b38f748a0d762dd
5 files changed