Prevent mixing mutable and immutable lists

As per errorprone feedback.

Test: TH
Change-Id: I4da5673551e4c8c4b3fea0aa65d34649126aaff8
1 file changed