Import translations. DO NOT MERGE am: b081f1e809  -s ours am: 43b03fbacf  -s ours am: 7e3f20e249  -s ours
am: b597ff837c  -s ours

Change-Id: I4372cfb4a6dc243e9915d40f147a38119e4d1666