Merge "libsnapshot: Fix mocked property fetcher" am: bc71949dd7 am: b6f5adf22c
am: 346c680da5

Change-Id: I6d700982f35e1f1dbdcb71250f702a8a99787177