[automerger skipped] Import translations. DO NOT MERGE
am: a3d23e5f94  -s ours

Change-Id: I7c65b9d0fb8cb529269f3c4c56abcf64a56c28e1