Import translations. DO NOT MERGE am: 20ecef5595  -s ours am: 96bbbc3dce  -s ours
am: 86da2d9b19  -s ours

Change-Id: I4a9cf24b90b387bb26bc946eab9c172cf6bc846d