Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev