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

Change-Id: I722dedc733dbb68da629a30325f4040fba2783e6