Import translations. DO NOT MERGE am: 3ed385256a -s ours am: 14c47203b3 -s ours
am: 5811075aeb -s ours
Change-Id: I0ea16471b0fe4caa83f0b08907325e6771d19ac2
This commit is contained in: