A bit of this and a bit of that

Change-Id: I0647ae760cdd200c956cf0af1478664aedfbcca6
Merge "A bit of this and a bit of that" into pac-4.4