Merge "Tweak RKP HAL comments"