am c1467908: am b8578741: Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb

* commit 'c14679089376fb7df28eb0a829518b33abb1d794':
  Fix issue #3424823: 4-corner trick causes runtime restart