Rename class

Identification: none
Change-Id: I6b6aebbe3d0516b1753e4ded3168ac9da153eb41
Add null check.

Identification: none
Change-Id: I7b460717ee0963316fe53635647cb2bf6d37ac84
Check list size
Identification: none

Change-Id: If798965317d1a7022868066c1b654b368e2eb1a0