(cherry picked from commit 5aff353f227ecfeb36ef6b8be787495916610490) Conflicts: odk/examples/cpp/custompanel/ctp_factory.cxx odk/examples/cpp/custompanel/ctp_services.cxx Change-Id: I5b561fec12415b2c05ff1369629a8f88b420510b
(cherry picked from commit d0b30a0f10f506187fcff9775934d3594c140ead) Change-Id: I898433cbdf9f779f425424d600ebb4f0946ccf20