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

Change-Id: Ic1222c60afe77701f5757b9c17addd3a05ecbfdc