[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ours
am: e3d501996e -s ours
am skip reason: subject contains skip directive

Change-Id: Id126adca02db4531eed9de1ff28b90875d3c3571