[automerger skipped] Import translations. DO NOT MERGE am: 4462a803bd  -s ours
am: 24ff5144a2  -s ours

Change-Id: I63b43ce2328e71559f75ce66d0ff0e3163572019