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

Change-Id: I6fe3f9758fc49e8589db4e4701cbee89b88931d1