Import Jack and Jill Carnac 1.2-b4

Jack version: 293400 d351fa665014def90ee66a12b2ef78d0421d3081
Jill version: 293400 d351fa665014def90ee66a12b2ef78d0421d3081

Bugs fixed since 1.2-b2
Bug: 27287140
Bug: 28157693

Bugs fixed since 1.2-b3
Bug: 27894910

Change-Id: I503ffb35c9d2097c7fb18f940ae027453060cf5a
5 files changed