Play nice with bacon

Change-Id: I85e6c91b64a582648db2a2a04e828514c721dbdb
Play nice with bacon

Change-Id: Ib8321d438887a36082464956abab8239828846c1
wrong branch

Change-Id: Ib61c0f22144484fba17c36f692465f44efea5ad4
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4