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

Change-Id: Iedce2c6e691e49ba8fdbd131221753fe0d9b8ee9