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

Change-Id: I4588ac5ea25b8beb62564afd63c472b1d816bf0a