[automerger skipped] Import translations. DO NOT MERGE am: 15fd49ceb0 -s ours
am: 4adc96de8e -s ours
am skip reason: subject contains skip directive

Change-Id: I8a7f70dbedbba56d5f3390c2130db672186f7eab