[automerger skipped] Import translations. DO NOT MERGE am: 4216c30148  -s ours
am: 5972df05a8  -s ours

Change-Id: Icde7c53ce7cb85f69a240b9797e5a8784d1d01c1