[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5a1b1a1b79 -s ours
am: c40702b4c3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie09e61a6d027d99a9b98baddc702f5e85f286e38