am a8549041: am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev

* commit 'a8549041ccdf38f8ddbdc5fc2bce84d737a89a7e':
  Optimize RTL properties resolution