Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac342 am: 8453136b" into nyc-mr1-dev-plus-aosp