Refactor a little bit and do the validation on also default.prop.

Change-Id: I76c2344d9033eadede7048689a879c9a69a05b7f
1 file changed