Bulk Cherry-Pick FGP Commits to 2.x Branch

[Fredy Wijaya]

Hi,

Just to give a heads-up, I'll do bulk cherry-pick FGP commits to 2.x
branch. Build is passing in the private build and Alex has verified it.

Let me know if you have any concerns.

Thanks,
Fredy