Merge "Import Jack and Jill Douarn 1.3-pa4" am: e18f034a31
am: f38157053e

* commit 'f38157053e5f40a4f76d550de3b5d2e104c5847b':
  Import Jack and Jill Douarn 1.3-pa4

Change-Id: Icf28657a37acd737d8529badb29a169d6bf087df