Track our system/media

Change-Id: I4c0d890bbec8b3bc506445e43f63dc6d3ee4d191
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>