Import translations. DO NOT MERGE am: c172391b04  -s ours
am: 5b4b31d78b  -s ours

Change-Id: I4c468fb166fafb45f1de2a4177494c1b42b43ba3