Import translations. DO NOT MERGE
am: 212cda9a9a  -s ours

Change-Id: I327873e50179cc0e48712ce95b855ddf9f935aae