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

Change-Id: Iff6d5bfe31a1721b56578633978ae19178a0208b