[automerger skipped] Import translations. DO NOT MERGE am: 7bb552c49e  -s ours
am: 91771ebf7a  -s ours

Change-Id: I84e57044916cb0b88ae40caac3dfbbe565f853d6