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

Change-Id: I62046fd6a1e7ac2b9393e92fb974b97026af81e6