Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev...
Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac342 am: a8687234" into nyc-mr1-dev-plus-aosp
am: 149ba9af
* commit '149ba9af':
Change-Id: I3cbc885ffbd985d3a719ea5e01f5c9bd7a12fa8d