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

Change-Id: I23f29e3a49d98b6382fcdc4043cbf7732fdb2fd3