Graph ext to master

Change-Id: I8cb4a4ba6b0bc0da12d84d1f8bf660e5a68302ee
Merge "Graph ext to master" into wmf/1.24wmf21