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

This reverts commit 6b6615209661bccd78cada63e789d538989b694b.

Change-Id: Id2ba85dcc8bd0161fb8a47fb5825388fb7f66cec
7 files changed