Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
am: 993890fbf4

Change-Id: Ie71ca3cc2144b6f700f1e9376fc2f571d3e19ce7