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: 2719c56c am: cc4b0f15
Change-Id: I5f1b711267008f339a2583998280b2b626ae75cc