Fixes for BlissPop

Change-Id: I0aaeb8370944bbed6fa0ba8650941031c388a176