add juno f21 workarounds

Change-Id: I62e036e5b6a9580dbadaf81249a09e042291c651