[automerger skipped] Import translations. DO NOT MERGE am: ec7315e039 -s ours

am skip reason: subject contains skip directive

Change-Id: I11f60dd6767f208ab5a31730afbec1301c8d9c9f