Merge "Address some comments for aog/333864"