Updated patches and files

Change-Id: Ibd4dad62c2f63ae12b6ab392b54ada09cba816f4