Merge "AML: Enable log and trace for non-process-switch launch"