[automerger skipped] Import translations. DO NOT MERGE am: 7a762b564f -s ours
am: 82d7d3d88b -s ours
am skip reason: subject contains skip directive

Change-Id: I87e593e96a0a440a4c22b7405f2b21b5fb232bb3