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

Change-Id: I8c25026d42e2fb767a5924dc8c4b69501c7fc8a4