Import translations. DO NOT MERGE
am: 3b4a3e0a0f  -s ours

Change-Id: I68a6f27af09691e2a27712ecab8c876f5eb26283