[automerger skipped] Import translations. DO NOT MERGE am: 508b5486f4 -s ours am: 06ad738ac3 -s ours am: 84fdaae352 -s ours
am: 5b745a8720 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f02e3747c3e0673b935bf685d8ae0feb5ced912