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

Change-Id: Ib754f5c564d9f5111d813f06d868c5e00fd337a0