Merge "Import Jack and Jill Douarn 1.3-rc2 as Stable" am: 02ffe75784 am: 8202cd6b80
am: d718f5d816

Change-Id: I7af75a869ac7f976f6e8d66a8207f4b8940340c8