[automerger skipped] Import translations. DO NOT MERGE
am: 5eecb74396  -s ours

Change-Id: Ie7fd32e5777975b87ffadd61a2fbccdeb1827653