am 962c7f87: (-s ours) am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev
* commit '962c7f874ac3eedf7d60bba0c559cea6240ab5ba':
This commit is contained in: