Vendor changes for snappy