Import translations. DO NOT MERGE am: bb3e765b77  -s ours am: 57d0077833  -s ours
am: 5b1a3a40c5  -s ours

Change-Id: I6703629ab6ff0e939e57e989c72167d4cfbd844f