Import translations. DO NOT MERGE am: 6173d397d2  -s ours
am: 3e026f92cf  -s ours

Change-Id: I65ed28f8a788bd1aeebaf8242f542fa698e967a4