Disable extra stuff for L bringup

Change-Id: Id796760af686fc5a308d2e35c51a9eeb8de241a6