Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread