Merge "Move atrace init into on fs trigger" am: 8fee401726
am: 23c7fe7195

Change-Id: I6f5871db3c55845f1eba18e5a7ab2be57332ce22