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

Change-Id: I51f476c193c538ea9514afd3e4bf65b6d94e46e3