[automerger skipped] Import translations. DO NOT MERGE am: 2c756ae525  -s ours
am: cb50682538  -s ours

Change-Id: If84dae2bbd1da1b76d602a6025f646484fe346df