Import translations. DO NOT MERGE am: 6fb3b77745 -s ours am: 9e7ac87d08 -s ours
am: ddb3a08aba -s ours
Change-Id: Iea3c6ec39fbd0c3e6454f6068aafe154de073155
This commit is contained in: