am 62ae8eee: am d20630f5: am e519917f: am 396a4d27: am a06c9707: Merge "Add sanity checks to fix crash" into klp-dev

* commit '62ae8eeecd99363f707320b7e424760be52cc221':
  Add sanity checks to fix crash