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

Change-Id: Ic5805292419908008d37c091097786e0b52f67f8