Merge "[automerger skipped] Import translations. DO NOT MERGE am: 9248f8bd8f -s ours am: 17a1f53bd8 -s ours
am: f8d411d435 -s ours
am skip reason: subject contains skip directive

Change-Id: I0f5391d03836e742995409c5bc1a01cd4e57a990