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

Change-Id: Ief8d398378cd73d050d0a92c94823c2086558ca5