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

Change-Id: I3c73d295484f334b839a238b0d8ab87d7c8eb2f6