Import Jack and Jill Carnac 1.2-rc4

Jack version: 298900 f95d7bdecfceb327f9d201a1348397ed8a843843
Jill version: 298900 f95d7bdecfceb327f9d201a1348397ed8a843843

Bugs fixed since 1.2-rc3
Bug: 28875299


(cherry picked from commit a278b8996ae39a1b1594d8c70e03411491d5781b)

Change-Id: Idac0324a2b01bdbe6b7d5726e86e580ac7e52a79
5 files changed