am 9ea8bf15: am 7908f190: Merge "Debug for b/10689184." into klp-dev

* commit '9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd':
  Debug for b/10689184.