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

Change-Id: I6541f1f27aeaa056ec3f5a24327d7fd051157023