Merge "Add log metrics for Aware status dialog"