Import translations. DO NOT MERGE am: e930d5a5f4  -s ours am: 7ab0a985ae  -s ours
am: b8790f77be  -s ours

Change-Id: Ifd25bbe89a6944418611386d7953c38d7be78ffc