Implement code refactoring based on feedback.

Change-Id: I1b3938f057cae11e6bc8dbc3d2a5f73b5dea7e14
Fixed component spec property bug.

Change-Id: I42b15bd713bc927ed7a4cf08742b45324a220ab1
Merge remote-tracking branch 'origin/master' into os-testing

Change-Id: I99bc59f9919105c9adb1400aee5e781eff6dfe3f