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

Change-Id: I470b213ed0dbd34fecc2d9e5b5b01a8bbb6d8a1a