Merge "Use Collection instead of List for entity list" into pi-dev am: 7b7e87eeb5
am: d4381891c3

Change-Id: Ifc4875458cbd9b72acade667aa1335efa5ec304e