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

Change-Id: I91d1f016ee2d5f3acd5999c08aaedbbe4b1a1e7c