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: 42059855
Change-Id: If2ff080df43e6661075a0ef8c03487aa2788f114