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

Change-Id: I1773bf47ab223bcd24dae0bc5e89e0fb1e7528e3