Update & clean some of contrib classes

Test: unit tests
Bug: 148283455
Change-Id: I5148dafd06b6fea9605da419cdf3363248c7b171
7 files changed