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

Change-Id: Ibf4acb6d9d6f839acb5510e592a4f27dd909d125