Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: e3e1e7b9d4 -s ours
Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
This commit is contained in: