Disable skip Validate on client composition am: 269c236109 am: 0ff681ca77
am: d3fec8b691

Change-Id: I5204120fcbb141bcca85429d0a797cd3e180ba0d