[WIP]fix up warnings, add back pocket mod hook to BLN

Change-Id: Ic5d1221f15debd9d446418792d4492cded0567fd