Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev