Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: 23e79be08d -s ours
am: 8c0d932862 -s ours
Change-Id: I210d176201ddc67e8c5e266283bfc24f2eb57bc8
This commit is contained in: