OpenDelta changes for SimpleAOSP L