Pass proxy objects to parent and eliminate duplication in subclass custom fields

Change-Id: Ie839f0b86e481d7d843555071a7e26d5a119bb49
Merge remote-tracking branch 'upstream/master'