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

Change-Id: I5639abd03f1e8974e576c1711e9956fa4b355a17