Android 5.1.1 release 5
am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit 'a05bd3c1cdff400ad92532b06d40ddc5c638c284':
  Fix integer underflow in ESDS processing