[automerger skipped] Import translations. DO NOT MERGE am: 2f654f3dd3 -s ours am: f69620e400 -s ours

am skip reason: subject contains skip directive

Change-Id: Icf222345e43742cfbe0e8a9e942c862535ee1e1e