Merge remote-tracking branch 'aosp/kitkat-mr1.1-release' into HEAD

Change-Id: Ice2071e60ec88b49d6f6640bbd6c20bc2af8bda4