[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639
am: 7b73069b0a  -s ours

Change-Id: I93eef5aeb3e029a70f602c145604a3320c219ddf