[automerger skipped] Import translations. DO NOT MERGE am: 924b6b462f -s ours
am: 4642928ddc -s ours
am skip reason: subject contains skip directive

Change-Id: I0c42f010fe61f3482c5e22c9678ffd0758f85de6