Merge changes Id85b2541,I4d253e2f into integration

* changes:
  fix(intel): update system counter back to 400MHz
  fix(intel): revert back to use L4 clock