tmp server commit

Change-Id: I4e563bb26cf97f88c87dd7e21244dedbeb4c3739
tmp validate commit

Change-Id: I14cab2a416b4a5edd32e31aa6eddb69fdddd8cdf