[automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours am: 968e15bced -s ours
am: 666fbf759d -s ours
am skip reason: subject contains skip directive

Change-Id: I4dc3b9d9c5d2b5c6bd256fe0c2d8bdde38e97ebe