Import translations. DO NOT MERGE am: 2c1d066618  -s ours
am: be2efcef20  -s ours

Change-Id: Icb2da595aa3f86ff54436fe76fdbe33cbb699dce