[automerger skipped] Import translations. DO NOT MERGE
am: 4f8a5c0dd6  -s ours

Change-Id: I2e91fa4b3c5f7d821f011f1da1842283484fe9df