Props handling in Gson

Change-Id: I2285c80317d4bcdec2eb0884755d1534b55ef540