Adding subject line option to sample; correcting minor issues

Change-Id: I012ae68c690d4e62c5ef5be30612b3f563161eb2