Import translations. DO NOT MERGE am: b4960d2ce6  -s ours am: 4881f571d3  -s ours am: c70aaaca99  -s ours
am: d6c7523ce3  -s ours

Change-Id: I4bffbc04fa9210a9152e17f651aaa7593c735340