Bring up to date with vendor

Change-Id: Ief213137a764c9a6081046161153a00edf4585bb
Merge "Bring up to date with vendor" into kitkat