Removed a START/END CODE BLOCK comment from the previous week.
Cherry-pick solutions from previous commit 1 of 2.
Cherry-pick solutions from previous commit 2 of 2.