am aad48db9: am cf06a033: Merge "Settings injector sample activity" into klp-dev

* commit 'aad48db964855c31e8f440c30cc3795d32d12703':
  Settings injector sample activity