Revert "Revert "[FP5-2743] Add patch for Aug Mainline upgrade""

This reverts commit d4a7ad6c7f288821ef63a41fdae27e54731e79a5.

Change-Id: I8ae7c347864241fde19798fea4a1f7761a992c4f
2 files changed