am a71ff4c3: Merge in Android 4.4

* commit 'a71ff4c34d708a2a130e5753e8ac966ddaa84c35':