[automerger skipped] Import translations. DO NOT MERGE am: b23678efdf  -s ours
am: 55d21547bb  -s ours

Change-Id: Ica5a0f4dd3b51c17972e1bb28941fdc37ef0fd8a