systemprop changes

Change-Id: Ib4b12062753be35a4eeef22c238a769c735628ea