[DO NOT MERGE] Import Jack and Jill Brest 1.1-rc2

Jack version: 169300 6818d55680a43e0b0b7b10ec50804c6c82d9c380
Jill version: 169300 18d76d9a6dc022d7d89b3033e15c6945f877b688

(cherry-picked from commit 9ebf1c82ff7cec98b657f2f4901ca8c42c6b2b23)

Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
5 files changed