[automerger skipped] Import translations. DO NOT MERGE
am: f17bfc0bc2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia39d3b9bf82c84150b5a89ca1c66809ec9e7d463