Merge changes from topic "am-3e9700c9325f4556b7faee7d24b41338"
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Fix Memory Leak: Part II of rewrite render info callback" into udc-dev am: ef163c02 am: 09499019 -s ours
[automerger skipped] [DO NOT MERGE] Fix Memory Leak: Part II of rewrite render info callback am: e22573d1 am: 19cb7e22 -s ours