Fix problems with customized HorizonMiddleware on development server.

Change-Id: I8c8bd9649724f37ed184b9e3ff57d48e85ca4f92
Merge "Fix problems with customized HorizonMiddleware on development server."