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

Change-Id: I55ed87c15305472eb44cc1d9813eea2a8c639d30