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

Change-Id: Ie53067d16f725455c31cc6fae123dfcce43c00f7