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

Change-Id: Icb02c1cc6e36d68200fbf74fe59bea9ac5c2638b