Clear collection after we used

Change-Id: Idbec734a2227cb333ed1cc47d64647a9da460e76
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Merge "Clear collection after we used" into jb-mr1
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Change-Id: I6d0aec9089d71d784045531a9ff28099d4d2e2a2