Commit By: tlyu Log Message: preparing for cherry picking merging Changed Files: A trunk-merge-28305/