Fix runtime crash on KitKat and prior. am: 60b59042d1
am: 9f1498ca13

* commit '9f1498ca138c69cefb241fe41510452924173b32':
  Fix runtime crash on KitKat and prior.