Merge "Populate error message if apexd verification fails"