[automerger skipped] Import translations. DO NOT MERGE am: 57088b8381 -s ours
am: c4b9dbfbaf -s ours
am skip reason: subject contains skip directive

Change-Id: I697a5b1115f306d6582ef3f2db9409cd05b57723