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 am: 6c764664
Change-Id: Iccbd16c82d3a5c6e3bf9c7ea0a21316fdccd2ae1