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

Change-Id: I527716eb6e1fa790faa9da0f0d3886a097dfeeb3