Merge "Address some review comments for aog/403114"