Merge changes from topics "is_debuggable", "stk_home_key_handling" am: 11bda12af7
am: 6cb4304be7

Change-Id: Ifa5b9ebd99b54f5f7225207a5d38b8b7bd7afe1d