am b8bff2ef: (-s ours) am 95735982: am 9660f096: Merge in Android 4.4

* commit 'b8bff2ef3f6e1eae67bfde7ee8357b9ff2e7184a':