Merge "[automerger skipped] Import translations. DO NOT MERGE am: 280cae0879 -s ours am: d829106de3 -s ours
am: 8d79ad6f12 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f6c4c6d440754b445bd8658b25ec83e9f32a008