Merge "Revert "Flush icache using rw to r transition""