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

Change-Id: I6ed30b3b83de7cc7c018b8e4ef53f8012f34e43a