digital property scheme fix
Closes-Bug: 1403621

Change-Id: Ia541fbaffa7b35cac80632126fd0bf5e8267930c
Merge "digital property scheme fix Closes-Bug: 1403621"