Merge "Test that KTPI is enabled" into pi-dev am: c0abdc3b19
am: 4485b5d7fc

Change-Id: Iefcb6d918d29e29d156b9473361ca7b24905a16a