Merged GPU challenge code

Change-Id: I9c16422aed73b3bd7246308371c35557029e1c20