Merge "Installd: Add context to test errors"