Import translations. DO NOT MERGE
am: ef41272507  -s ours

Change-Id: I9b2cf2eafd15280f5f3c52fc05aa320c79c83d87