Import translations. DO NOT MERGE am: cfd9728512  -s ours
am: 428f31db5a  -s ours

Change-Id: I5be7951a937d630ba989be1fe74dc303403c4897