Merge "Adding capability to granular disable of fuzzer" am: 5c5cc67ee2 am: c2887f9e28

Change-Id: I51dac1813bad2a7f22a4f91cce45757252420de3