Import translations. DO NOT MERGE am: 80d87da085 -s ours am: d250d3aa34 -s ours
am: 09e6f1457b -s ours
Change-Id: I7010ae3bb92d9ec2adaa9eba4509ad2b713ecee7
This commit is contained in: