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

Change-Id: Ieba13f755eed297925524f7bbd97eb2d00ebead7