Merge "Add tests for property reads from unset properties" am: f1e0f2e365
am: 22202139d5

Change-Id: Iebe5ae73ad1c3d87e8b40239f6394809cd67367e