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

Change-Id: I7e228f66a17fbdede843865827fc91f4c6790509