Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours
am: 587eb37902 -s ours
Change-Id: I9d92b3ef136d59f48ab053e0fe8ae82631790d20
This commit is contained in: