This reverts commit 946280d6. Reason for revert: Breaking builds due to doc generation using these samples Change-Id: I7caf9792e84e0e1eedea4a7294a321c684be2d5c