Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924
am: 9295f6f36d

Change-Id: I8bab2100c4ec84d3aa6438acb16a93c97fab53e1