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

Change-Id: Ie857627dcbd7811548b381929078622d776e4acd