Re-landing and 239444 and 239455.

TBR=gnanasekar.s@samsung.com

Review URL: https://codereview.chromium.org/110163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239461 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 239461