Merge "diag: Add apps diag support for STM"