[FP5-2743] Add patch for Aug Mainline upgrade

Change-Id: I21a7c72f81c5373733fed84b2a650a235b6cfe85
7 files changed