Merge "Move atrace init into on fs trigger"