[automerger skipped] Import translations. DO NOT MERGE am: 0869a7ceb5  -s ours
am: 30bdb13ce7  -s ours

Change-Id: I0de461d7fbe6b89ade9bb01cfae78f0da42ec73c