[automerger skipped] Import translations. DO NOT MERGE am: 01fde57628  -s ours
am: 2dd43a115c  -s ours

Change-Id: Ia829d04f4c1133799d380427acd01549583d6a41