Import translations. DO NOT MERGE
am: 92ba705e9f  -s ours

Change-Id: Ic918cea2b37e09957f22467160225069bee70a67