am 89b7ab4c: Merge "Add systrace regions for file opening during setup."

* commit '89b7ab4cc6e5372bb4dabcc06a907fc333eca3f6':
  Add systrace regions for file opening during setup.