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

Change-Id: I6a45fa6f274773e72385e7e1f8356b7e7ad68995