prop opt

Change-Id: I85071a4e839fc54ce9750a2224093e5ac3a5ba76