NullDependencyContainerTest

Change-Id: Ic7699c08ecf6c1dead39869f114c53582fcbde28
CategoryPropertyAnnotatorTest

Change-Id: I92e0025a99e4e3e6c603fc04397a440b7e277f04