[automerger skipped] Import translations. DO NOT MERGE am: 3f4b3c946d  -s ours
am: 2fd79e4f04  -s ours

Change-Id: I750f7031dce2023f2b586af1c18e75ed4895090b