Imported Scudo Standalone changes:
am: 92abc6d0cd

Change-Id: I400a498379e76ac11de723d2547d4b541f3541af