conventions, correct bugs in other classes found during test. Change-Id: I7f490793678741ffa41769a63371e06d27840bdb Former-commit-id: fe6ec52b4cf64d410f3de609b06cf9666a5936bc