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

Change-Id: I09cc017a73cf2653396c7ceaf101b0a6233bbddd