Import translations. DO NOT MERGE am: e7f9b0b30b  -s ours
am: f8b4927683  -s ours

Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0