Merge "Add initial values for properties" into pi-dev
am: 3b50bd927b

Change-Id: Ib565a847a2b138a5b20df58cea9e665ca022a3cc