Merge changes Ic701675c,Ie55e25c8 into integration

* changes:
  plat: imx8m: Correct the imr mask reg offset
  plat: imx8m: Keep A53 PLAT on in wait mode(ret)