Merge "Remove LAST_FORWARDED_NUMBER reporting." into pi-dev am: 23db26fdfa
am: d71643b390

Change-Id: I43c96f57828d5387ea75a23df99993bae788cbb8