Eliminated PropertyEditTool

Change-Id: I8ad97a4ecb50f11a9be8447500bf0a300ca8d4e7
Merge "Eliminated PropertyEditTool"