Export definition of ObjectFactory and PropertyFetcher am: d038b2bc3e
am: b7121dc174

Change-Id: I207547463296ccc5a2fd2feda78901b33535c14f