Import translations. DO NOT MERGE am: b18162c6f7  -s ours
am: 73cc878a0e  -s ours

Change-Id: Ieea78d6be8fa6e617ebe93117dfeb54feba8644e