Merge changes I2bf4e96f,I9b136efc

* changes:
  Migrate fake user hal.
  Add special logic handle setting some props.