[automerger skipped] Import translations. DO NOT MERGE
am: 842a692a1a  -s ours

Change-Id: I9eec5a8c584a726c2e9679a4729bff62bb7a0838