Import translations. DO NOT MERGE am: a6c51e2c94  -s ours am: 563510e1b6  -s ours
am: 96853eb87d  -s ours

Change-Id: I33f98d53a50bc42203d10039ccc075a762b474f1