[automerger skipped] Import translations. DO NOT MERGE am: b4564f2811 -s ours
am: c0a2649896 -s ours
am skip reason: subject contains skip directive

Change-Id: I46e79d4b51d144c70ce7d7d51de1ba78cdbe8bc2