am 69d28437: Merge "RRO tests: fix potential NPE"

* commit '69d28437d3416301895639b4c51f9b31842126f5':
  RRO tests: fix potential NPE