Import translations. DO NOT MERGE am: 37ed23f55b  -s ours
am: 2c6c13aabd  -s ours

Change-Id: I5386c78a7fbcc319c06d6ab8d6b6835fd498526e