Merge "Remove LAST_FORWARDED_NUMBER reporting." am: c573777f43
am: e133ca70b6

Change-Id: I1e325235fd652fe39b4fe9da6b7360eda50d37d4