(cherry picked from commit 893548addb)
893548addb
* Fix nested noop block padding in dynamic includes * Address issues from the review * Fix typo