Merge "Fix a few NPEs due to trying to access a null collection's iterator"...
Merge "Fix a few NPEs due to trying to access a null collection's iterator" into rvc-dev am: 40e7fe7f am: 98c60154 am: 4ba6df89 am: 266126c0
Change-Id: I2fa303a1903489a460ec23eeacd88f0486c8c745