fixups for twrp

Change-Id: Ie6a8c13b1f44d3cb0f577fd0d9e4de63ab48641e