Disable skip Validate on client composition
am: 269c236109

Change-Id: Ib0d2f8a9e59cf4618ed029fe35391f566d11bcfb