Merge "Properties: Tweak change marker."
am: b7e8552681

Change-Id: I5740bcb61a040e196a898f2928b573f27e802a2d