Import translations. DO NOT MERGE am: 90009f2b76  -s ours am: a6d502e993  -s ours
am: a6ce7f41cd  -s ours

Change-Id: Ifedb8ea24a76a4aab244cd2e8d04e21fcabb2066