DO NOT MERGE: Drop SDK@870732 from klp-dev.

Change-Id: I0ff9c90c7a05d6582f47cad703ab36d827f3929e
2 files changed