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

Change-Id: I77ab17aabe7d22cd42f0f3b517541d2978eafd64