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

Change-Id: Ibd8fc97999023dc603932df5413cce9d00c82b12