(cherry picked from commit 5aff353f)

Conflicts:
	odk/examples/cpp/custompanel/ctp_factory.cxx
	odk/examples/cpp/custompanel/ctp_services.cxx

Change-Id: I5b561fec12415b2c05ff1369629a8f88b420510b