Merge "Address some code comments"