Updates for TWRP

Change-Id: Ic199397efa181804242f24387f354ce2f298acb9