[automerger skipped] Import translations. DO NOT MERGE am: 258c9e234d -s ours am: e1a47fad7a -s ours
am: 267c0c37e6 -s ours
am skip reason: subject contains skip directive

Change-Id: I81ce32916603bae9804b3b75678dd600e4bcec61