[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
am: d82564708f  -s ours

Change-Id: Ib7d487392cec9a11e587b50a5b91899a215599a8