Import translations. DO NOT MERGE
am: 1e1898b6af  -s ours

Change-Id: Idb37c0fe2b763cf5cf505a7ad32691042bee393e