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

Change-Id: I12640dda9d7cdf7cf3480cd01820e99724dd0458