[automerger skipped] Import translations. DO NOT MERGE am: 26153a9975 -s ours
am: 9d8b6c4131 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieff6f137de053f5e2419a617b087fe8ae8d7d279