[automerger skipped] Import translations. DO NOT MERGE am: 5e7182ce14 -s ours am: 808ec5ca0b -s ours
am: 13a77d8fdf -s ours
am skip reason: subject contains skip directive

Change-Id: I52f2e6424955a50c40bafd5751b5d15d81b6eb14