Merge "Flush icache using rw to r transition" am: bf3710ecec
am: 24ac9f7fe6

Change-Id: I9e248162111744eb0c5b913c87e1ddaa5aa6a37a