[automerger skipped] Import translations. DO NOT MERGE am: a74e575627  -s ours
am: 98464f7aef  -s ours

Change-Id: I4c85411666aee91818518521e58f9c42344c0907