[automerger skipped] Import translations. DO NOT MERGE am: d55c856b38  -s ours
am: 8493ba6bce  -s ours

Change-Id: Ic0e45f157f23ebe2985b4cc378cdd9131f5afa8f