Fix profiling error CommonSettings.php-skin-include1

Change-Id: I13428b6525c776ba58f5a30c917e1c266d334360
Merge "Fix profiling error CommonSettings.php-skin-include1"