am 0b7197a6: am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."

* commit '0b7197a612459caf2cdac8b9f0c0b8c5365b7837':
  Refactor a little bit and do the validation on also default.prop.