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

Change-Id: Ib573a60c4337b096069007047a903678d6135812