Follow our own system/media

Change-Id: Ib21dca54e2ea531f89687947d45411882d4b31e6