[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ours am: 7b644d7f78 -s ours
am: 204c916181 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd67e2560c0aac749400decff59215e388c64ec0