Merge changes Icf10d577,Ia9d3cae7

* changes:
  Factor out a class to store the rebootEscrow key
  Add namespace in DeviceConfig to support ota teams's features