Merge "CTS : hal : Fix the NULL deference pointer issue"