Griffo-Backed Ethics Reform Measure Passes Both Houses