[automerger skipped] Import translations. DO NOT MERGE
am: 40ac4a061c  -s ours

Change-Id: Icf3e6a404da79b00d90358db7e3546d12d4e51b0