am fd5f56d4: Merge "Revert "GVN final fields even with side effects.""

* commit 'fd5f56d4604eeeacdf6be5189187b6ef49157280':
  Revert "GVN final fields even with side effects."