[automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722 -s ours
am: 295bba0c03 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfa4422f4cf0a785b2e54c638d43ed5000551db2