[automerger skipped] Import translations. DO NOT MERGE am: 3447b7b66c -s ours
am: b9b2241edb -s ours
am skip reason: subject contains skip directive

Change-Id: I3a3a9a303f6fb64c8868b85f8e8a8f4393ab1eff