Merge branch 'vendor_drops' into prism_dev

Change-Id: I382e6e13087874e6009d2dec5a8c4740de317a51