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

Change-Id: Ief144d63a3ffbb94276b130040e506094f8be576