[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours

am skip reason: subject contains skip directive

Change-Id: I3b3dbfb8fb2d0bcf79b01fcd86256a334f692a39