am a80b45c8: Merge "Remove LocalEnd since it is not used"

* commit 'a80b45c86a04bb06322be1689789e0b82489a697':
  Remove LocalEnd since it is not used