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

Change-Id: Ic574b886adf96f885df03ea36199e33907363b54