Remove MW dependency from PredefinedPropertyAnnotator

Using a PageInfoProvider to encapsulate relevant MW objects

Change-Id: Icd2c39394e5f37f8f78bfce147f562212a45d6f6
Merge "Remove MW dependency from PredefinedPropertyAnnotator"