Import translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours
am: 57b56329f3 -s ours
Change-Id: I1d86bc055b65520c41615ddf919c64890f1b653f
This commit is contained in: