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
Change-Id: I2de10dabf4ce7fc5732cb977e8d6a88bb2d12f01