am 3a64769b: am ba9704d4: Merge "Remove LocalEnd since it is not used" into lmp-dev

* commit '3a64769b045e49f3cc470dd60436c70d73ed0d47':