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

Change-Id: Id7f550aa57db12cc21e765d23814fba13f478e35