am 3cbd7151: Merge in Android 4.4

* commit '3cbd7151ee1e8a2531b84669197e3beee58fe952':