Imported Scudo Standalone changes:
am: 71069c16f0

Change-Id: Id4e675d3d8b485a55161661d5e4f2dc26cc566ba