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

Change-Id: I9a218221aafa63fe8d9da6abc127ef549fd58a79