Merge "Add logging of what derive_sdk sees" am: 07f63db9f7 am: 2fe9938f7c am: fa8665d524

Change-Id: I2dbfc9ca1c5c3dad016479d9a6c1040b26b4b080