Merge "Address post-commit review comments"