DO NOT MERGE: Update SDK@872126 from klp-dev

Both current/ and 19/

Bug: 11141002
Change-Id: I2404bdd59fd0089129e31978188f90383e822b6f
4 files changed