kk
Merge https://github.com/NexPerience/android_vendor_nxp_grouper