[automerger skipped] Import translations. DO NOT MERGE am: 77eb59d530  -s ours
am: 2890a3c48e  -s ours

Change-Id: I31a5f70d852025971698916bb077bd2f89e30361