am f717b620: am f65b3dfb: merge in klp-release (no-op)

* commit 'f717b6208ce995e25f74a99cccf2727c836ad46e':