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

Change-Id: Idbf51ac7814b03bcd26ec9659c783c2f9a28714f