Merge "Import Jack and Jill Douarn 1.3-b16 as Stable" am: 760a6e1609 am: e36dd7b2f1
am: 80a7561123

Change-Id: I73b0344f85ded6ca11abb3a670de9732b7db7d1c