Inject dataTypes into expert store creation

Change-Id: Ie68c6d3783d29a224a56b9b44cc67a099841dba0
Remove unused module dependency

Change-Id: I4d453db6f6b9fc1bb78e4c09282d578a9b3e1d2b
Merge "Inject dataTypes into expert store creation"
Merge "Remove unused module dependency"