Merge "Set explicit target when constructing PendingIntent" into rvc-dev am: dca99f9618

Change-Id: Ia14775198d0c928b0dfe43b08f213496ab4a10fc