[automerger skipped] Import translations. DO NOT MERGE am: 97ddd025ac -s ours am: 682a615610 -s ours am skip reason: subject contains skip directive Change-Id: I83aeade21346a8691834e39faf46ef78a6528567