am 2b133fc0: am 21ae1ad6: RTP: Minor fixes with polishing.

Merge commit '2b133fc07533a853f7de23da4f60a766f4233bed'

* commit '2b133fc07533a853f7de23da4f60a766f4233bed':
  RTP: Minor fixes with polishing.