Imported Scudo Standalone changes:
am: 42baac2fc5

Change-Id: If6aa0ad4f35f0e7b7b6c93c6ba0f036b39e9b970