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

Change-Id: Ib22b93d6dc85877963815d3b52addae8a5da6850