Make controller address configurable.

Change-Id: Ibfea2ddbda344439052876a29ee58a9e122eb244
Merge "Make controller address configurable."