Merge "Fix warning: Potential leak of memory pointed to by 'set'" am: 58ba53bd53
am: 0889a8a070

Change-Id: I8672f532a2ab43275a9204fe732b6b6ba1604388