Merge "SELinux labels bug logging and workaround" into tm-dev