[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours
am: 1f8f4362c4 -s ours
am skip reason: subject contains skip directive
Change-Id: I8d520cc26e8315f8bbb6eb1694547dfab1bc4e0a
This commit is contained in: