Merge "Add back alpha atrace log" into mnc-dev