Import translations. DO NOT MERGE am: 7060296d02  -s ours am: 3dc3d3eda4  -s ours
am: af88f8aa7e  -s ours

Change-Id: Ibd6707e219dc7bf6ee2b976a508075f5f9fd37dd