Merge "Fix DefaultSmsApplicationTest on COPE" into udc-dev