am 83b9f125: Merge in Android 4.4

* commit '83b9f12572ea676114d876a7b7f724caedef2b79':