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

Change-Id: I96194961497a17665734b3cec8c41e9ea6d018c0