Unified unified prop updates

Change-Id: Ib7bb0464942345ba3b29f1ca307b8114b63aa0ec