Add third-party changes w.r.t. server-manager UI.

Change-Id: I65e2383c6fa8fc75ec2b66a306b86e15b6c298c4
Merge "Add third-party changes w.r.t. server-manager UI."