Merge "Add some MTE-related helpers." am: 4fe5b783a4 am: 4904c919a5

Change-Id: I4f9b26f8e35d08d981a77a2e557311c13f1dbf91