Added more Setup.php profiling

Change-Id: Ie76c1ae54ccf825f387b57a8e9096f608eb3d120