Import translations. DO NOT MERGE
am: 03fa77f054  -s ours

Change-Id: I3434d54d4ba5673ba174c76dd8ddf5a52afcf31b