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

Change-Id: I4ff4081bde67bde628f4a27350f5354746812c9c