Import translations. DO NOT MERGE am: 49a9d35eb7  -s ours
am: c48ebb548b  -s ours

Change-Id: Idb782499f71b009757bb7c1ba8064c7d3e2c18da