Merge in Source Changes from Samsung MG5 SPH-L300_VMU