[automerger skipped] Import translations. DO NOT MERGE am: 0d0e8bf980 -s ours
am: 79be37cee6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf7e51228ff15988ab94944efc3138deed1efd41