Merge "Import Jack and Jill Douarn 1.3-rc5 as Stable" am: 272bdaffcc am: 64f1334a0f
am: ebe8f8d07f

Change-Id: I722f30c3083b3e670d28f51766770d2549337bae