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

Change-Id: I4abfc2508dd390f1956e0b4471df8915f4bf8407