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

Change-Id: I144c24a4b3c2dcab4693d0f5eb45a2df29b2c380