[automerger skipped] Import translations. DO NOT MERGE am: 5dd4272ee4 -s ours
am: 2245b41b31 -s ours
am skip reason: subject contains skip directive

Change-Id: If89fcb13087b6a6c27bbc9e35b77e435b35b24f7