Import translations. DO NOT MERGE am: a6b32526d7  -s ours
am: f6a7a97ab5  -s ours

Change-Id: I51cf96a100e1a84bbc8fbd6dc5ce26b66056ec12