[automerger skipped] Import translations. DO NOT MERGE am: c9dd883594 -s ours am: 8fc8cd38fa -s ours
am: f331c3bda0 -s ours
am skip reason: subject contains skip directive

Change-Id: I7d9b29dfbdf0a929c6e10e6b36ee03ebdadb3227