Import translations. DO NOT MERGE am: 4a8554f78b  -s ours
am: 8ea8e8cf70  -s ours

Change-Id: I96a6fc7cfc031a41f692bef0c8456ad8276143bf