Import translations. DO NOT MERGE
am: a860e80b92  -s ours

Change-Id: I4050d7e0cf2c5967382acb5e8465f213f0322c5f