Merge "Instrument SDK level and change IDs to help testing"