Import translations. DO NOT MERGE
am: 3860bee3d0  -s ours

Change-Id: I20e9ef5633150a5c63afdb562d48fd029279f771