re-organise the patches

Change-Id: I258cbb22c8eee595696f371e089c6b6709446014