Import Jack and Jill Brest 1.1-mr2

Jack version: 175100 000a2f91edbe638090dc577801ba49592229fd8b
Jill version: 175100 293f35ef9f6f952a8302b92a1546e6034c30a7c0

Bug: 22491084
Change-Id: I0cfa859e622e7cea04e943172695c35989095608
5 files changed