[automerger skipped] Import translations. DO NOT MERGE
am: 0e894a09a2  -s ours

Change-Id: I2a8112a048be781c075d7ae2e80fd84c3cc0b50b