Disable skip Validate on client composition am: 269c236109 am: 89283e56d6
am: 00ce8550c5

Change-Id: I52df65bd858b3765ea5c81bb8a6aaa8c98a498b7