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

Change-Id: I92005f4d76a63c12786f6da3c8ef377c21a7649a