Merge "Merge "Update SELinux error" into udc-dev am: 083b5fe640 am: fa24247c90"