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