Merge "More robust restorecon and additional debug info." into tm-dev