[automerger skipped] Import translations. DO NOT MERGE am: 19a39a9f2d -s ours
am: 27031e0674 -s ours
am skip reason: subject contains skip directive

Change-Id: Id334cbd37c5175dd326ce66940251e73c2c2ae50