Imported Scudo Standalone changes: am: c910695c12 am: 84ec7dc758

Change-Id: I4914b7d584671b623e159b8caee2969204dc6b1f