Disable skip Validate on client composition
am: 269c236109

Change-Id: I4c0a4a90ff0ca2e39075ad643d1892597301d3fd