Disable extra stuff for L bringup

Change-Id: I362e4d932ec601216d32d4ed158b682d44084489