Removing unneeded patches

Change-Id: I88ebf92bbe3ebef3cf7007b741a24d159d3aac00
Merge "Removing unneeded patches"