Prop updates

Change-Id: I43f3c0afa824d973b70c4105800108d4b72794af