Import translations. DO NOT MERGE am: b9fa3d1115 -s ours am: 1b16f952e7 -s ours
am: bfeafd271c -s ours
Change-Id: I0d2ba6ce2109ff293330dcd3bdae66d8a72b93fe
This commit is contained in: