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

Change-Id: If52a78d1e03974dd2e6ff1529289a23b4e27207d