Import translations. DO NOT MERGE
am: c2eddc99cd  -s ours

Change-Id: I266b3575318dc829b6b9a2f9ded5a268f81db89b