Prevent getSaveFields from returning a property named undefined

Change-Id: Id7326ee8b951ba2219d3ea6767370ece9aba3c23
Merge "Prevent getSaveFields from returning a property named undefined"