Add property activity and fragment
am: 705bfc591b

Change-Id: Id456f97d1af91a62040bd09fc1e3c73156e4783a