am f008ca33: am f681058f: Merge "Narrow previous fix for this issue." into klp-dev

* commit 'f008ca333a06ed5afe50653dcd2f413a4b490d49':
  Narrow previous fix for this issue.