Import translations. DO NOT MERGE am: 495d4ce1b9  -s ours
am: 120c3e9874  -s ours

Change-Id: I149d23fe5cdedb0ecb813d252277e15e75055c01