System.prop you bastard

Change-Id: I7117982b8df229e166f1f0912d081800db6cd956