[automerger skipped] Import translations. DO NOT MERGE am: 49df8f0725 -s ours
am: 9a24bb7ed9 -s ours
am skip reason: subject contains skip directive

Change-Id: I20cce240f16f0c26d61e78a2bed8abfab67419b5