many changes to a fallen behind AV - Thanks CM

Change-Id: I65e8a149c9f77578f7a263fb87f72a132c211250