Work on writing default values for Custom props

Change-Id: I80cfee9099183cec5b5bc5bf8ea1f2c0992c4c15