Import translations. DO NOT MERGE
am: 3e8a8c97bb  -s ours

Change-Id: I55e6b60d44c99e47783526de2176bbd7c9929b47