Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Only fire the specified pending event URI Change-Id: Ib800603d830c9b4ba688b0222ac5642ad50f17a0