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

Change-Id: Id8e05d219ef73616cdef7152008b487050f25373