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

Change-Id: Ib8f6a4ea48fbe3a95153ee15be71bedd81d1e88c