Import translations. DO NOT MERGE am: bdba1ead72  -s ours
am: bd7fc276ef  -s ours

Change-Id: I50af680107264190f6ee3a183879fae0ac09ed2a