[automerger skipped] Import translations. DO NOT MERGE am: 8dda6713c0 -s ours
am: 5f83b0c3ad -s ours
am skip reason: subject contains skip directive

Change-Id: I8e3261007d892e9be41736d3a12e210896fdbe8b