Move these back to make merging easier.

Change-Id: I363dae9da807af2d36401cbc0a0dac195454f72a