Import translations. DO NOT MERGE
am: 5a9f7d6c9a  -s ours

Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7