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

Change-Id: I639aa6e61fac2adabee67f134f81014dec9a256e