Update libraries for Lollipop
ImmutableSet -> Set
Add null check