Import translations. DO NOT MERGE am: 5820d03643 -s ours am: 86f3cf9bc9 -s ours
am: c08df6766c -s ours
Change-Id: Ie46f9e196ca527b119c6797ae546e8d6d44a48d9
This commit is contained in: