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

Change-Id: I3bbbeee73aed7711a1c215a46d388c080d8feff7