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

* commit '7ecedb75c833a746c561dd0029b0accf175033be':
  Narrow previous fix for this issue.