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

Change-Id: I9ce4cf233e42d42ca04a3ff295d366c5b71924ff