Merge into 4.3

Due to large files > 100 MB, This is not a true merge with the commit history

Change-Id: I40e38236484eff91af48877c0e45ef075e6d223a