am 0c283cc5: am 08c8c0b4: Merge in Android 4.4

* commit '0c283cc5e77b63d9cbd9984857a5cc15250e688d':