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

Change-Id: I6d7922fef9b0583a2922bd434f882648669a26e9