Merge "Add null-pointer check for mHalWrapper"