Squash TRDS Mms commits/fixes from AICP

Credit/Thanks to AICP team and kroz

Change-Id: Ie7310268c0621dd67acaeef017e693f09dceabcc