Merge "ComponentBaseTest.java enhancement and"