Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
am: 793ac34219

* commit '793ac342196c57f6b89ad9d1425fc420fbb44bb5':
  Prevent use of a null sCallbackObj by Hardware FLP

Change-Id: I9f7984826be418e8703bce449a9753d40e477fd0