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

Change-Id: I577e8bacc6a7778ac741d5a539c3df06589891e3