Import translations. DO NOT MERGE am: 961b18d42f  -s ours
am: 4f596f6cf7  -s ours

Change-Id: Ie23c66cedc3e5b9aab0b35b084dc28b2e0f76385