am 3554fe2b: Merge in Android 4.4

* commit '3554fe2b1ad728fd6d106d0842ca467b78bc274b':