Merge "Import translations. DO NOT MERGE" into pi-dev am: 5016d48709  -s ours
am: a49c4a21d0  -s ours

Change-Id: I76f78b39e1a1bf7857a796621750336ee1fd13f7