Import translations. DO NOT MERGE am: 15be9b5aff  -s ours
am: e9a7d341e3  -s ours

Change-Id: Id0691d54b5b73c2ed4459a11c5241c33232154ef