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

Change-Id: Idee6f9b363c8d294235057fe94e5a52c5b65ad5c