Merge "Doc Change: Revert NotePad sample test package" into gingerbread