am 2be40f76: am 88628e2b: Merge "Discards frames for code within library."

* commit '2be40f767b254b25d2cb32616b3340bdd83ccf41':
  Discards frames for code within library.