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

Change-Id: I87f8e54b19c958d71bb78482b64324e4a02de250