Imported Scudo Standalone changes: am: 130bfdb823 am: 1e2a9e68fc

Change-Id: I3a57dcaab9164b7cc5415ed08e8f350f6bba4311