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

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