Import translations. DO NOT MERGE am: dadac5c7e7  -s ours
am: 19ed21c912  -s ours

Change-Id: Ic02bd3a20ad6325c115759f411be353ecf62c033