Merge from TheMuppets proprietary_vendor_samsung

Change-Id: I56d151fa9deea87e1f649ed7f4ca122fc68379bf