Import translations. DO NOT MERGE am: b43b49c643 -s ours am: 483ca13e0b -s ours
am: a58c30a2f3 -s ours
Change-Id: I71f3d5f220c98723f2b3e54c14c32cc04ee7e22e
This commit is contained in: