Revert "Merge downstream branch 'developers-dev' into 'klp-dev'"

Undoing recent merge to get a clean klp-dev samples release without
template code. Will un-revert for followup release with templates after
that build has been cut.

This reverts commit bc6fe0f65025563ab50af193b099a8fca95ff0a2.

Change-Id: Icd2b9772986de7c4978a92e7e22bb2c2cef20bd0
1140 files changed