[automerger skipped] Import translations. DO NOT MERGE am: 31161dba35 -s ours
am: 7ae398d5ef -s ours
am skip reason: subject contains skip directive

Change-Id: If5d64ccc660c1b7627e5b2a4f872491b88d06538