Merge "Updating samples as per API changes"