Import translations. DO NOT MERGE
am: 8969c8976e  -s ours

Change-Id: Ia35305e462ecdc2cc46b365ae4ee70bd5612a3bd