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

Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc