Import translations. DO NOT MERGE am: 37fa5cbc28 -s ours am: 35b2ed41ce -s ours
am: dca4571f89 -s ours
Change-Id: I00c6e2ac628975709220a4ab5c43dcc9f343568b
This commit is contained in: