Merge changes I701d7f7f,If85b8c4c

* changes:
  test(realm): fix bug in RMI_RTT_SET_S2AP command helper
  test(realm): add support for s2poe/pie for planes