am 28e52c81: am b35f68a6: Merge "init: load factory properties"

* commit '28e52c816d06d78fa823be2d310d9f4c25012c8f':
  init: load factory properties