(cherry picked from commit f6e8da3661)
f6e8da3661
This also fixes the code sample's indentation to look correct in the editor help.