Will resubmit when the API CL got merged. This reverts commit bfe1405b. Change-Id: I891190fb5ffd39004f4823bae66494f5ca34e830