[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc am: 023ae30cdd  -s ours am: 16e78b6dc1  -s ours
am: e16f27b3fc  -s ours

Change-Id: Ib6702b93752a79c08d16bf5035435f14b7e0c350