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

Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0