Import translations. DO NOT MERGE am: 3941e96a4d  -s ours
am: c6831def3c  -s ours

Change-Id: I71b84f22a6dabc8e0c092cd04f19652ff0ac0b25