Merge "Fix Null pointer access in GKI timer library" into klp-wireless-dev