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

Change-Id: Ic3a126ae6090ab65206fdc52f7d5a56876d0130d