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

Change-Id: I7524ad9ed2ff981471bf286d896548e8cae3ae3e