Import translations. DO NOT MERGE am: 41036b1156  -s ours
am: eda4994d2f  -s ours

Change-Id: I5fd9b2dc08efb9814547d8dd293f7775ee6f18ce