Track our own system/media

Change-Id: I42e21087733230b19dac2df163d9397af99d6ace