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

Change-Id: Id6a875b51725f610fbbc9ecb43b8fa384c95e65f