Fixes for TWRP

Change-Id: I18077d4c89070977535665517c3498c79490480e