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

* commit '6a53bd9ddbff5dcccec3cd3928e10317007031d3':
  RRO tests: fix potential NPE