[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44 -s ours am: 1b7486fe92 -s ours
am: 7ef83b488d -s ours
am skip reason: subject contains skip directive

Change-Id: Ifef8b9b0eeec95694da0eebe47b9fe830da862fe