Import translations. DO NOT MERGE
am: 55151b2b02  -s ours

Change-Id: Ieb3787d64479bb7042431e773f6ab8ba19305fca