Import translations. DO NOT MERGE am: 57906b3ef2  -s ours
am: 5aa24942de  -s ours

Change-Id: Ib4b93524a593d1cd0c50bd4f9485f94edc911d4b