This CL changes API only.
Internal behavior will be changed in another CL.

BUG=None
TEST=Run a test

Review URL: http://codereview.appspot.com/5437086