Import translations. DO NOT MERGE am: 3b4e128814  -s ours
am: 639a3c78bd  -s ours

Change-Id: Ic094d7d723178e650504e1706e05fa5dae10801c