am 08c8c0b4: Merge in Android 4.4

* commit '08c8c0b407644514983a0eeb8c97435bfeb7ef58':