Merge "Import Jack and Jill Douarn 1.3-pa5"
am: 4c1c4c1c4b

* commit '4c1c4c1c4b54ceab6bb106eca3270877e916e4a5':
  Import Jack and Jill Douarn 1.3-pa5

Change-Id: I15dc0d1cf54ff93dfe399a7b40d0fc8859ba823d