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

Change-Id: I8036ded8a5c8222ebb557e35bee5e23078840f6d