Import translations. DO NOT MERGE am: c2d1c05172  -s ours
am: 0ecd8a914e  -s ours

Change-Id: Ie1bee354dc8abf60d43906daba778ae6e8e546cc