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

Change-Id: Idbe05be72985a3bea3471c9561a72db8e8482178