Merge "Remove direct boot awareness support for TSMS"