[automerger skipped] Import translations. DO NOT MERGE am: bfb7a7227c -s ours am: e248e57375 -s ours
am: 070682821b -s ours
am skip reason: subject contains skip directive

Change-Id: I78b4a257794b473959d95ef15cb7c81db37e0d74