[RJ-Servi] Add nullable annotations and remove inconsistencies

Change-Id: I17e792a661776e7a0cfa4eec9f2461c0b9de5387
49 files changed