Import translations. DO NOT MERGE am: 33e43a7f0b  -s ours
am: a816b9a534  -s ours

Change-Id: Ia58cb78f064a90275d5abcfcca66fdefc6cde403