5/15 master -> stable

R=arv
BUG=

Review URL: https://codereview.appspot.com/9424044