Import translations. DO NOT MERGE
am: 30d5c06bd2  -s ours

Change-Id: I49db6d44845abaf4e2f48fbebe3a14ea045d0cc3