Import translations. DO NOT MERGE am: ba8e772bbe  -s ours
am: bbed9c1eb3  -s ours

Change-Id: Ic82286e8dd0f471f79c315720c1bd9d74c3b66ce