fusion3-common: Multiple fixes for lollipop / merges from mako

Change-Id: I436a0975ea7db496cc298e04bee9a2bd90f0ff2f